Don't add pointless getters

svn path=/trunk/; revision=21114

diff --git a/ChangeLog b/ChangeLog
index 2afb383b5c308d279fe6f2bfb498c3f4ee9b98ab..43b071c44b5f6bd454f37bbe310b378f5db423c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-13  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 547673 – Accessors for GtkFileSelection.font_entry and
+       font_style_entry
+
+       * gtk/gtk.symbols:
+       * gtk/gtkfontsel.[hc]: Don't add getters for widgets that are not
+       actually part of the font selection dialog in standard builds.
+       Pointed out by Torsten Schoenfeld
+
 2008-08-13  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 547516 – Add comments for translators in gtkprintbackendcups.c

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index ca8ba1a3809b9313e5440ff22dad144baa69dcdb..0f7eb481e577621275568bac15fbc4da081d8cad 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtk-sections.txt: Remove useless getters
+
 2008-08-13  Torsten Schoenfeld  <kaffeetisch@gmx.de>
 
        * gtk/gtk-sections.txt: Move

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 3147f078a2556e5e3cdc17a7e86c9fa8916e223d..c1317bc885092957ec8404f6127d452597004dbe 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1600,11 +1600,9 @@ gtk_font_selection_set_font_name
 gtk_font_selection_get_preview_text
 gtk_font_selection_set_preview_text
 gtk_font_selection_get_face
-gtk_font_selection_get_face_entry
 gtk_font_selection_get_face_list
 gtk_font_selection_get_family
 gtk_font_selection_get_size
-gtk_font_selection_get_family_entry
 gtk_font_selection_get_family_list
 gtk_font_selection_get_preview_entry
 gtk_font_selection_get_size_entry

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index d64be51c453ca3d7795e3064ec42092d500769ac..3da5b590de8079381e6b0a0b598ec935f2408c33 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1612,10 +1612,8 @@ gtk_font_selection_get_font
 gtk_font_selection_dialog_get_font
 #endif
 gtk_font_selection_get_face
-gtk_font_selection_get_face_entry
 gtk_font_selection_get_face_list
 gtk_font_selection_get_family
-gtk_font_selection_get_family_entry
 gtk_font_selection_get_family_list
 gtk_font_selection_get_font_name
 gtk_font_selection_get_preview_entry

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 4bfd8d6285081c9c0f9587044aae76be793f1f7d..33e6e29264d6be1c1bf3740ff15280691f43595a 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1122,25 +1122,6 @@ gtk_font_selection_get_font_internal (GtkFontSelection *fontsel)
  * These functions are the main public interface for getting/setting the font.
  *****************************************************************************/
 
-/**
- * gtk_font_selection_get_family_entry:
- * @fontsel: a #GtkFontSelection
- *
- * This returns the #GtkEntry that allows the user to manually enter
- * the font family they want to use.
- * 
- * Return value: A #GtkWidget.
- *
- * Since: 2.14
- **/
-GtkWidget *
-gtk_font_selection_get_family_entry (GtkFontSelection *fontsel)
-{
-  g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
-  
-  return fontsel->font_entry;
-}
-
 /**
  * gtk_font_selection_get_family_list:
  * @fontsel: a #GtkFontSelection
@@ -1160,25 +1141,6 @@ gtk_font_selection_get_family_list (GtkFontSelection *fontsel)
   return fontsel->family_list;
 }
 
-/**
- * gtk_font_selection_get_face_entry:
- * @fontsel: a #GtkFontSelection
- *
- * This returns the #GtkEntry responsible for allowing manual
- * configuration of the font style.
- * 
- * Return value: A #GtkWidget. 
- *
- * Since: 2.14
- **/
-GtkWidget *
-gtk_font_selection_get_face_entry (GtkFontSelection *fontsel)
-{
-  g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
-  
-  return fontsel->font_style_entry;
-}
-
 /**
  * gtk_font_selection_get_face_list:
  * @fontsel: a #GtkFontSelection

diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index 125537b2f7dca6ee5fa2ba3c2fb2a72b7e12309c..07cba45eb62b8ddff1405cf9cf8a99fe4d231b6b 100644 (file)
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -144,9 +144,7 @@ struct _GtkFontSelectionDialogClass
 
 GType       gtk_font_selection_get_type          (void) G_GNUC_CONST;
 GtkWidget *  gtk_font_selection_new               (void);
-GtkWidget *  gtk_font_selection_get_family_entry  (GtkFontSelection *fontsel);
 GtkWidget *  gtk_font_selection_get_family_list   (GtkFontSelection *fontsel);
-GtkWidget *  gtk_font_selection_get_face_entry    (GtkFontSelection *fontsel);
 GtkWidget *  gtk_font_selection_get_face_list     (GtkFontSelection *fontsel);
 GtkWidget *  gtk_font_selection_get_size_entry    (GtkFontSelection *fontsel);
 GtkWidget *  gtk_font_selection_get_size_list     (GtkFontSelection *fontsel);